projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0820584 c4fea86)
bitkeeper revision 1.1159.217.20 (41ebdda5ZO9YBU_VHuSh0IwgcQe0Ng)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Mon, 17 Jan 2005 15:45:41 +0000 (15:45 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Mon, 17 Jan 2005 15:45:41 +0000 (15:45 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/cl349/xen-unstable.bk-merge

1  2 
tools/libxc/xc.h patch | diff1 | diff2 | blob | history
tools/libxc/xc_linux_build.c patch | diff1 | diff2 | blob | history
tools/python/xen/xm/create.py patch | diff1 | diff2 | blob | history

diff --cc tools/libxc/xc.h
Simple merge
diff --cc tools/libxc/xc_linux_build.c
Simple merge
diff --cc tools/python/xen/xm/create.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.